test: zk dispute game factory and registry by 0xChin · Pull Request #19872 · ethereum-optimism/optimism

0xChin · 2026-04-01T15:56:25Z

Summary

Adds ZK dispute game test coverage for DisputeGameFactory and AnchorStateRegistry, proving both contracts work correctly with the new ZK_DISPUTE_GAME type (game type 10).

Changes

`DisputeGameFactory.t.sol`

Restructuring:

Extracted ZK tests from generic factory test contracts into dedicated _ZkDisputeGame_ contracts
Moved test_create_implArgs_succeeds into DisputeGameFactory_Create_FaultDisputeGame_Test for explicit game-type separation
Created DisputeGameFactory_ZkDisputeGame_TestInit abstract base with shared helpers (_createZKGame, _assertZKGameFactoryStorage, _assertZKGameCWIA)

New test contracts:

DisputeGameFactory_Create_ZkDisputeGame_Test — create happy path, zero bond, wrong bond, no impl, duplicate UUID
DisputeGameFactory_SetImplementation_ZkDisputeGame_Test — impl+args storage, non-owner revert
DisputeGameFactory_SetInitBond_ZkDisputeGame_Test — bond set/update, non-owner revert
DisputeGameFactory_FindLatestGames_ZkDisputeGame_Test — multi-game ordering

New generic test:

testFuzz_create_overpayment_reverts — verifies factory rejects overpayment (sends more ETH than required bond)

`AnchorStateRegistry.t.sol`

New abstract base:

AnchorStateRegistry_ZkDisputeGame_TestInit — creates a real ZK game via factory, provides _mockZkGameAsValid() helper

New test contracts:

AnchorStateRegistry_SetAnchorState_ZkDisputeGame_Test — valid newer state, older game claim rejected, blacklisted, retired, challenger wins, not finalized (6 tests)
AnchorStateRegistry_IsGameClaimValid_ZkDisputeGame_Test — valid claim, blacklisted, retired, not respected (4 tests)
AnchorStateRegistry_IsGameProper_ZkDisputeGame_Test — all conditions met, blacklisted (2 tests)
AnchorStateRegistry_BlacklistDisputeGame_ZkDisputeGame_Test — blacklist succeeds (1 test)

Test plan

DEV_FEATURE__ZK_DISPUTE_GAME=true forge test --match-path test/dispute/DisputeGameFactory.t.sol
DEV_FEATURE__ZK_DISPUTE_GAME=true forge test --match-path test/dispute/AnchorStateRegistry.t.sol
just pre-pr passes

ashitakah · 2026-04-01T17:04:37Z

packages/contracts-bedrock/test/dispute/AnchorStateRegistry.t.sol

+    function setUp() public virtual override {
+        super.setUp();
+
+        skipIfDevFeatureDisabled(DevFeatures.ZK_DISPUTE_GAME);


Every this is testes when zk dispute game is enabled. Maybe create one to check that reverts if the flag is disabled.

With the flag disabled, the ZK game implementation wouldn't be deployed or registered in the factory so there's no zkGameProxy to test against. The ASR and factory are game-type agnostic; they don't check the feature flag themselves. The flag only gates deployment at the OPCM level, which is already covered by test_upgrade_enableZKGameWithoutDevFeature_reverts in the OPCM tests. At the ASR/factory level, "flag disabled" just means "no ZK game exists," which isn't a ZK-specific scenario worth testing here.

packages/contracts-bedrock/test/dispute/DisputeGameFactory.t.sol

packages/contracts-bedrock/test/dispute/AnchorStateRegistry.t.sol

packages/contracts-bedrock/test/dispute/DisputeGameFactory.t.sol

0xOneTony · 2026-04-02T12:56:21Z

packages/contracts-bedrock/test/dispute/DisputeGameFactory.t.sol

+/// @title DisputeGameFactory_ZkDisputeGame_TestInit
+/// @notice Reusable test initialization for ZKDisputeGame factory tests.
+abstract contract DisputeGameFactory_ZkDisputeGame_TestInit is DisputeGameFactory_TestInit {
+    IZKVerifier zkVerifier;


do we need this?

It's declared as a state var in TestInit because both _createZKGameWithParams (which sets it) and _assertZKGameCWIA (which reads it) live there. The alternative would be returning it from _createZKGameWithParams and passing it as an extra param to _assertZKGameCWIA, but I'd rather keep it this way

packages/contracts-bedrock/test/dispute/DisputeGameFactory.t.sol

packages/contracts-bedrock/test/dispute/AnchorStateRegistry.t.sol

0xOneTony

requesting changes above^

0xOneTony · 2026-04-02T16:58:31Z

/ci authorize a651fe6

0xChin · 2026-04-02T20:20:15Z

/ci authorize c41aa6f

ashitakah · 2026-04-03T13:03:05Z

/ci authorize f64a2c6

0xChin · 2026-04-03T13:33:11Z

/ci authorize 92e894d

packages/contracts-bedrock/test/dispute/DisputeGameFactory.t.sol

packages/contracts-bedrock/test/dispute/zk/ZKDisputeGame.t.sol

packages/contracts-bedrock/test/dispute/AnchorStateRegistry.t.sol

packages/contracts-bedrock/test/dispute/zk/ZKDisputeGame.t.sol

packages/contracts-bedrock/test/dispute/DisputeGameFactory.t.sol

packages/contracts-bedrock/test/dispute/AnchorStateRegistry.t.sol

0xChin · 2026-04-03T16:09:52Z

/ci authorize 1a786ef

0xChin added 7 commits March 31, 2026 17:01

test: add ZK DGF tests

9ccc54d

test: restructure ZK dispute game factory tests into dedicated contracts

f868731

test: add bond overpayment scenario

3946a3f

chore: pre-pr

34ff082

test: add ZK dispute game tests for AnchorStateRegistry

661f1c6

chore: run just pr

84923be

Merge branch 'develop' into test/zk-dispute-game-factory-and-registry

c15f8c5

0xChin self-assigned this Apr 1, 2026

ashitakah requested changes Apr 1, 2026

View reviewed changes

0xChin added 5 commits April 1, 2026 16:18

refactor: use vars instead of magic numbers

a02e5d6

test: do assertions over exact values

107747f

refactor: add zkCreateParams helper function for reused logic

818ca5b

test: check findLatestGames works if n > gameCount

27d0889

test: check notRegistered path in ASR ZKDisputeGame test

dfe8893

0xOneTony approved these changes Apr 2, 2026

View reviewed changes

0xOneTony requested changes Apr 2, 2026

View reviewed changes

0xChin added 5 commits April 2, 2026 12:08

test: add fuzz testing

38a5518

test: add more fuzz tests

b864e08

refactor: use IDisputeGame interface

e1d31f8

refactor: add reused vars/logic in init contract

46e6ce0

chore: run just pr

a651fe6

0xChin added 2 commits April 2, 2026 16:37

fix: just-upgrade CI failing

4b80e5b

chore: run just pr

c41aa6f

Merge branch 'develop' into test/zk-dispute-game-factory-and-registry

e8910df

ethereum-optimism deleted a comment from 0xChin Apr 3, 2026

ashitakah and others added 2 commits April 3, 2026 10:15

feat: remove skip

f64a2c6

fix(ci): resource-intensive test breaking CI

92e894d

ashitakah requested changes Apr 3, 2026

View reviewed changes

test: increase test coverage in ASR

e97e928

0xOneTony reviewed Apr 3, 2026

View reviewed changes

packages/contracts-bedrock/test/dispute/DisputeGameFactory.t.sol Outdated Show resolved Hide resolved

packages/contracts-bedrock/test/dispute/AnchorStateRegistry.t.sol Show resolved Hide resolved

packages/contracts-bedrock/test/dispute/AnchorStateRegistry.t.sol Show resolved Hide resolved

0xChin added 2 commits April 3, 2026 12:59

refactor: remove redundant oneliner

9d6cb9f

test: ensure same state after revert in ASR

1a786ef

0xChin marked this pull request as ready for review April 3, 2026 16:11

0xChin requested review from a team and smartcontracts April 3, 2026 16:11

Conversation

0xChin commented Apr 1, 2026

Summary

Changes

DisputeGameFactory.t.sol

AnchorStateRegistry.t.sol

Test plan

Uh oh!

ashitakah Apr 1, 2026

Choose a reason for hiding this comment

Uh oh!

0xChin Apr 1, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

0xOneTony Apr 2, 2026

Choose a reason for hiding this comment

Uh oh!

0xChin Apr 2, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

0xOneTony left a comment

Choose a reason for hiding this comment

Uh oh!

0xOneTony commented Apr 2, 2026

Uh oh!

0xChin commented Apr 2, 2026

Uh oh!

ashitakah commented Apr 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

0xChin commented Apr 3, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

0xChin commented Apr 3, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

`DisputeGameFactory.t.sol`

`AnchorStateRegistry.t.sol`

ashitakah commented Apr 3, 2026 •

edited

Loading